maintainers: Modify format of file

The previous format was not very practical and hard to parse by
scripts. The current format is easier as it uses more tokens that can be
identified by scripts, while maintaining a reasonably good result when
it is rendered.

Some maintainers maintain more than one subsystem but they were all
part of the same entry. In cases like this the entry has been split
into two to clarify what file belongs to which subsystem.

The list of maintainers of the Trusted Firmware has been updated.

Change-Id: I4be2d527c5171e8d2d86fb49e45e1d9dbcbd2d80
Signed-off-by: Antonio Nino Diaz <[email protected]>

diff --git a/maintainers.rst b/maintainers.rst
index 2dd20acac5115950e12e65d1d30b0db7cb570b09..94bb5d31821b018b25f797e72a559c183371de56 100644 (file)
--- a/maintainers.rst
+++ b/maintainers.rst
@@ -7,190 +7,168 @@ parts of the codebase is delegated to the sub-maintainers listed below. An
 acknowledgement from these sub-maintainers may be required before the
 maintainers merge a contribution.
 
-Maintainers
------------
-
-Dan Handley ([email protected], `danh-arm`_)
-
-David Cunado ([email protected], `davidcunado-arm`_)
-
-OPTEE and QEMU platform sub-maintainer
---------------------------------------
-
-Jens Wiklander ([email protected], `jenswi-linaro`_)
-
-Files:
-
--  docs/plat/qemu.rst
--  docs/spd/optee-dispatcher.rst
--  services/spd/opteed/\*
--  plat/qemu/\*
-
-TLK/Trusty SPDs and NVidia platforms sub-maintainer
----------------------------------------------------
-
-Varun Wadekar ([email protected], `vwadekar`_)
-
-Files:
-
--  docs/plat/nvidia-tegra.rst
--  docs/spd/tlk-dispatcher.rst
--  docs/spd/trusty-dispatcher.rst
--  include/bl32/payloads/tlk.h
--  include/lib/cpus/aarch64/denver.h
--  lib/cpus/aarch64/denver.S
--  services/spd/tlkd/\*
--  services/spd/trusty/\*
--  plat/nvidia/\*
-
-eMMC/UFS drivers and HiSilicon HiKey and HiKey960 platform sub-maintainer
--------------------------------------------------------------------------
-
-Haojian Zhuang ([email protected], `hzhuang1`_)
-
-Files:
-
--  docs/plat/hikey.rst
--  docs/plat/hikey960.rst
--  drivers/emmc/\*
--  drivers/partition/\*
--  drivers/synopsys/emmc/\*
--  drivers/synopsys/ufs/\*
--  drivers/ufs/\*
--  include/drivers/dw\_ufs.h
--  include/drivers/emmc.h
--  include/drivers/ufs.h
--  include/drivers/synopsys/dw\_mmc.h
--  plat/hisilicon/hikey/\*
--  plat/hisilicon/hikey960/\*
-
-Allwinner ARMv8 platform sub-maintainer
----------------------------------------
-
-Andre Przywara ([email protected], `Andre-ARM`_)
-
-Files:
-
--  docs/plat/allwinner.rst
--  plat/allwinner/\*
-
-HiSilicon Poplar platform sub-maintainer
-----------------------------------------
-
-Shawn Guo ([email protected], `shawnguo2`_)
-
-Files:
-
--  docs/plat/poplar.rst
--  plat/hisilicon/poplar/\*
-
-MediaTek platform sub-maintainer
---------------------------------
-
-Yidi Lin (林以廸 [email protected], `mtk09422`_)
-
-Files:
-
--  plat/mediatek/\*
-
-NXP QorIQ Layerscape platform sub-maintainer
---------------------------------------
-Jiafei Pan ([email protected], `qoriq-open-source`_)
-
-Files:
-
--  docs/plat/ls1043a.rst
--  plat/layerscape/\*
-
-NXP i.MX 8 platform sub-maintainer
---------------------------------------
-
-Anson Huang ([email protected], `Anson-Huang`_)
-
-Files:
-
--  docs/plat/imx8.rst
--  plat/imx/\*
-
-Raspberry Pi 3 platform sub-maintainer
---------------------------------------
-
-Antonio Niño Díaz ([email protected], `antonio-nino-diaz-arm`_)
-
-Files:
-
--  docs/plat/rpi3.rst
--  plat/rpi3/\*
-
-RockChip platform sub-maintainer
---------------------------------
-
-Tony Xie ([email protected], `TonyXie06`_
-or `rockchip-linux`_)
-
-Files:
-
--  plat/rockchip/\*
-
-Synquacer platform sub-maintainer
----------------------------------
-
-Sumit Garg ([email protected], `b49020`_)
-
-Files:
-
-- docs/plat/synquacer.rst
-- plat/socionext/synquacer/\*
-
-Texas Instruments platform sub-maintainer
------------------------------------------
-
-Andrew F. Davis ([email protected], `glneo`_)
-
-Files:
-
-- docs/plat/ti-k3.rst
-- plat/ti/\*
-
-UniPhier platform sub-maintainer
---------------------------------
-
-Masahiro Yamada ([email protected], `masahir0y`_)
-
-Files:
-
-- docs/plat/socionext-uniphier.rst
-- plat/socionext/uniphier/\*
-
-Xilinx platform sub-maintainer
+Main maintainers
+----------------
+:M: Dan Handley <[email protected]>
+:G: `danh-arm`_
+:M: Dimitris Papastamos <[email protected]>
+:G: `dp-arm`_
+:M: Soby Mathew <[email protected]>
+:G: `soby-mathew`_
+
+Allwinner ARMv8 platform port
+-----------------------------
+:M: Andre Przywara <[email protected]>
+:G: `Andre-ARM`_
+:F: docs/plat/allwinner.rst
+:F: plat/allwinner/
+
+Armv7-A architecture port
+-------------------------
+:M: Etienne Carriere <[email protected]>
+:G: `etienne-lms`_
+
+eMMC/UFS drivers
+----------------
+:M: Haojian Zhuang <[email protected]>
+:G: `hzhuang1`_
+:F: drivers/emmc/
+:F: drivers/partition/
+:F: drivers/synopsys/emmc/
+:F: drivers/synopsys/ufs/
+:F: drivers/ufs/
+:F: include/drivers/dw_ufs.h
+:F: include/drivers/emmc.h
+:F: include/drivers/ufs.h
+:F: include/drivers/synopsys/dw_mmc.h
+
+HiSilicon HiKey and HiKey960 platform ports
+-------------------------------------------
+:M: Haojian Zhuang <[email protected]>
+:G: `hzhuang1`_
+:F: docs/plat/hikey.rst
+:F: docs/plat/hikey960.rst
+:F: plat/hisilicon/hikey/
+:F: plat/hisilicon/hikey960/
+
+HiSilicon Poplar platform port
 ------------------------------
-
-Siva Durga Prasad Paladugu ([email protected], `sivadur`_)
-
-Files:
-
--  docs/plat/xilinx-zynqmp.rst
--  plat/xilinx/\*
-
-Armv7-A architecture sub-maintainer
+:M: Shawn Guo <[email protected]>
+:G: `shawnguo2`_
+:F: docs/plat/poplar.rst
+:F: plat/hisilicon/poplar/
+
+MediaTek platform ports
+-----------------------
+:M: Yidi Lin (林以廸) <[email protected]>
+:G: `mtk09422`_
+:F: plat/mediatek/
+
+NVidia platform ports
+---------------------
+:M: Varun Wadekar <[email protected]>
+:G: `vwadekar`_
+:F: docs/plat/nvidia-tegra.rst
+:F: include/lib/cpus/aarch64/denver.h
+:F: lib/cpus/aarch64/denver.S
+:F: plat/nvidia/
+
+NXP QorIQ Layerscape platform ports
 -----------------------------------
+:M: Jiafei Pan <[email protected]>
+:G: `qoriq-open-source`_
+:F: docs/plat/ls1043a.rst
+:F: plat/layerscape/
+
+NXP i.MX 8 platform port
+------------------------
+:M: Anson Huang <[email protected]>
+:G: `Anson-Huang`_
+:F: docs/plat/imx8.rst
+:F: plat/imx/
+
+OP-TEE dispatcher
+-----------------
+:M: Jens Wiklander <[email protected]>
+:G: `jenswi-linaro`_
+:F: docs/spd/optee-dispatcher.rst
+:F: services/spd/opteed/
+
+QEMU platform port
+------------------
+:M: Jens Wiklander <[email protected]>
+:G: `jenswi-linaro`_
+:F: docs/plat/qemu.rst
+:F: plat/qemu/
+
+Raspberry Pi 3 platform port
+----------------------------
+:M: Antonio Niño Díaz <[email protected]>
+:G: `antonio-nino-diaz-arm`_
+:F: docs/plat/rpi3.rst
+:F: plat/rpi3/
+
+RockChip platform port
+----------------------
+:M: Tony Xie <[email protected]>
+:G: `TonyXie06`_
+:G: `rockchip-linux`_
+:F: plat/rockchip/
+
+Synquacer platform port
+-----------------------
+:M: Sumit Garg <[email protected]>
+:G: `b49020`_
+:F: docs/plat/synquacer.rst
+:F: plat/socionext/synquacer/
+
+Texas Instruments platform port
+-------------------------------
+:M: Andrew F. Davis <[email protected]>
+:G: `glneo`_
+:F: docs/plat/ti-k3.rst
+:F: plat/ti/
+
+TLK/Trusty secure payloads
+--------------------------
+:M: Varun Wadekar <[email protected]>
+:G: `vwadekar`_
+:F: docs/spd/tlk-dispatcher.rst
+:F: docs/spd/trusty-dispatcher.rst
+:F: include/bl32/payloads/tlk.h
+:F: services/spd/tlkd/
+:F: services/spd/trusty/
+
+UniPhier platform port
+----------------------
+:M: Masahiro Yamada <[email protected]>
+:G: `masahir0y`_
+:F: docs/plat/socionext-uniphier.rst
+:F: plat/socionext/uniphier/
+
+Xilinx platform port
+--------------------
+:M: Siva Durga Prasad Paladugu <[email protected]>
+:G: `sivadur`_
+:F: docs/plat/xilinx-zynqmp.rst
+:F: plat/xilinx/
 
-Etienne Carriere ([email protected], `etienne-lms`_)
-
+.. _Andre-ARM: https://github.com/Andre-ARM
+.. _Anson-Huang: https://github.com/Anson-Huang
 .. _antonio-nino-diaz-arm: https://github.com/antonio-nino-diaz-arm
+.. _b49020: https://github.com/b49020
 .. _danh-arm: https://github.com/danh-arm
-.. _davidcunado-arm: https://github.com/davidcunado-arm
-.. _jenswi-linaro: https://github.com/jenswi-linaro
-.. _vwadekar: https://github.com/vwadekar
+.. _dp-arm: https://github.com/dp-arm
+.. _etienne-lms: https://github.com/etienne-lms
+.. _glneo: https://github.com/glneo
 .. _hzhuang1: https://github.com/hzhuang1
-.. _shawnguo2: https://github.com/shawnguo2
+.. _jenswi-linaro: https://github.com/jenswi-linaro
 .. _masahir0y: https://github.com/masahir0y
 .. _mtk09422: https://github.com/mtk09422
-.. _TonyXie06: https://github.com/TonyXie06
-.. _glneo: https://github.com/glneo
-.. _sivadur: https://github.com/sivadur
-.. _rockchip-linux: https://github.com/rockchip-linux
-.. _etienne-lms: https://github.com/etienne-lms
 .. _qoriq-open-source: https://github.com/qoriq-open-source
-.. _Andre-ARM: https://github.com/Andre-ARM
-.. _b49020: https://github.com/b49020
+.. _rockchip-linux: https://github.com/rockchip-linux
+.. _shawnguo2: https://github.com/shawnguo2
+.. _sivadur: https://github.com/sivadur
+.. _soby-mathew: https://github.com/soby-mathew
+.. _TonyXie06: https://github.com/TonyXie06
+.. _vwadekar: https://github.com/vwadekar